merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 26 Mar 2012 05:41:04 +0000 (14:41 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 26 Mar 2012 05:41:04 +0000 (14:41 +0900)

Trivial merge